small fixes and adds