Some final changes before demo
Bug fix for release