changed map, fixed bradens code errors