fixes
poor commit
tests...
before merge
merge