Multiple typos, small bugs on first test