Fixing what paul broke, cleaning up repo