cleanup and bug reporting atarted