cleaned up some code, added MWP exception