Second Commit

Fixed a few things