lots of changes
fixed merges