Fix some typos and fill out some more of the skeleton, getting ready for some benchmarks