some setup hacking
moved to dotsetup
fixed imports