small fixes and updates