re-recorded demo; misc improvements