Fixed horrible bugs in the MTW