Maps: Fixed minor issues. Worked on demos.