fixing issues, more to be fixed
Getting it up to date for MOP