minor
Cleanup + fixes