scaffold building nicely aligned now
small tweaks on build/move timing