added a bit on todo