changed one error logging to exception
updated todos