fixing outstanding bugs
there is always a map
values
cleanup
value tuning