fixed jmap inconsistencies, watch scoping issues
Merge pull request #24 from jtmoulia/pre-freeze-fixes

fixed jmap inconsistencies, watch scoping issues