* fix up override and form cleaning for imports
* cleanup and comment