small fixes and changes