Final Update

Most Bugs Fixed. Turned in project