Features Completed
Fixed a few early bugs