Bug Fixes, Improve Consistency

Also undid some of the comments that weren't suppose to be there