Changes
fixes
more fixes
tests, removed old adapters, fixes, etc