small fixes and minor changes