fix code so all demos worl properly

todo: fix lesson 06 and ready to merge!