Fixed a few bugs and added spacing