minor objectmap improvements (in progress)