added todos, added execution cap, cleared junk