Corrected lots of small errors