mop up on isle 5...

some more house work before starting on the ui-builder.