Small fixes
Cleanup
TODO error message