Bug Fixes

Fixed the few minor bugs that mdm096 had without having any way to see
in Eclipse.