Fixed some setting inconsistencies, and cleaned up a bit