fixing warnings and cleaning up some imports