Fixes mainly, project clean up