Imports cleanup and a couple small bugs. Still no validation