imports are better on top
some better stuff
minors adjustment
merge with submit