misc fixes and comment deborkifying