Fixed typos and bugs, updated to do list