Updated project settings and did minor cleanup.