added TODOs + fixed some typos