fixes before xml
XML MAP O YEAHHHHHHH
Merged changes