Includes Steve(s)'s and Nick's corrections