Added Map class and tweaked with Orb class