lots of small tweaks preping for demo