Fixed several errors. Added a few TODO items for I'm unsure of