Bug fixes / cleanup