Did some more tests and added stuff to the TODO file.