fix missing setting of no_dots, cleanup