moved some stuff around, fixed scaffolding issues