annotation & variable type declaration changes
moved a bunch of includes around
moved more includes
trying to fix the damned treemap
reverted to older version of treemap code