Fixed some general things that were bugging me