fixed a few bugs, added messaging for demo user