doing some small fixes