prepush rework
Minor typos