updated config setup, including new options and removal of obsolete options