fixes and testing