fixes / cleanup