added some more companions
more companions
merge fixes
Merge branch 'jpecht-master'