couple more fixes and addition of map