Corrected typos, and comments. Made less generic.