more ignores and tidy up settings