Cleaned up a few things, added TODOs