Woops, it didn't compile. Also updated some comments so they're accurate.