misc work on demos