minor changes and demo  mode