add better dev logging
update TODO