made heapsize non-global
fixed name/group annotation
other small mods