Clean Up Repo
Clean Up repo and bug fixes