Fixed an annoying typo + general maintenance!