update TODO
better error logging
fix error in prev commit