cleanup types
update scaffolding
more docs