Solomoriah Several updates suggested by James Lemon