upcycling updates and some additions to the todos