hmm2 map objects
many changes