#12 fixing some import and other stuff