Mdl26 uon fixes

Fixes issues #1, #2, #3, #4, #5, & #6