revert back to make invoking flex, fix a few bugs