* some small fixes