added some small fixes