more updates; added todo