change core settings to class; some bug fixes