bug fixes and simplifications and config file updates