a couple of bugs being fixed