Fixed mo's mistakes