first time run bug fixes