minor final adjustments pre-demo