various fixes
bug commenting and fixes