made some small fixes