fixed an exception crash, updated TODOs and README