Some additions and fixes
Merge