- some bug fixes and removed a TODO