amended defuns, added new global settings