map additions and fixes

revamp needed.  all fix #503
some errors of  #498