Changed some things around the project, fixed the errors that the last
commit caused