Squashing some bugs / typos