fixed jmap inconsistencies, watch scoping issues