general fixes / comments