Uppercase, valid GUIDs

and some bugfixes, extended variable handling, etc.