lots of things cleaned up in week 9
more cleanup
put demo back into p4