lots of changes
Fixes for merge