some small fixes..