more fixes
fix maps