better default settings
removed debug code