updated exception messages, added todo.txt
resolved merge conflicts