Minor changes, added testmap5