added a few fixes
Merge branch 'master' of https://github.com/eddyz87/pfci4102