fixed typos and added todos