Second Commit

Fixed a bunch of small things