test and fixes
test and fix