apparently some bug fixes