implemented holdoff time, some small fixes