did some small fixes