Renamed project, made some changes/bug fixes