bug fixes
second changes
test