misc fixes, comments