final pre-demo tweaks + tests