fix broken init file and some cleanup