added more imports.  Fixed minor bugs