Cleaning up and adding demos