improved handling of bottom

not ready for review yet
extract ```"Map:choice"``` to be a constant?