Major Update

Fixed all the bugs mentioned during the beta test