minor changes, ready for live