first round bug fixes