small fixes and polish