- some bug fixes / cleanup