bug fixes for live version