Changed some offsets
Merge branch 'master' of github.com:davidnuon/poffinfactory
Offset works better