typo
cleanup + extra things