Made more sense to and simplified how settings affect.

Also improved data validation further.