v.1.8.1 release - Segregated settings into sections, cleaned up some code