bug fixes, first time running