fixes and test