some small fixes;