small fixes and testing