add some small fixes