Cleaned up some stuff and more work on the demo