Fixed a few bugs, cleaner formatting, no client side aspirations for now