Post Demo Commit

After feedback given post-demonstration, some features was changed.