Cleaned up and refactored demos
didn't work with fish shell, does now
Update README