refactor some locations
build fixes/start xml validation