wip: typo snuck in there, removing
wip: small tweaks
wip: more style tweaks