Large overhaul

added handler function,  added/removed ini values, etc