fix many typos + merge cass's changes