Final adjustments. Good enough for demo.