Cleaned up some exception messages. Added a few more TODOs.