Fix typos, watson style inline issues