small fixes and changes.