some small fixes added