Cleanup

--made lots of changes for demo.