Fixed all the small, silly, problems