Some more tidying to make more manageable
Fix Makefile, add -Wextra flag, fix highlighted issues