Restored UMP code from SAMMY Kernel and fixed lost/broken code.