bug fixes for go live at weekend