fixed a couple bugs
updated TODO with new stuff that will be implemented