Fixing remaining project issues

Fuck GIT