some fixes + collisions
Merge origin/master