Cleaning up repo and fixing crashes
updating to fix crash