Fixed spell problem and minor stuff