Switched to Tim's notation and corrected a few typos