Fixup typos and errors - still broken