Added more maps and some minor fixes