Dev XML and config update

Basic bugfixes again :)