Tidying up

Fixed some warnings, updated some settings, removed some extraneous stuff.