Minor bug changes
Migrated project from desktop to git repo
Minor Bug Fixes