bug fixes for live deployment