small fixes and a merge