Fixed a few small things and organized things