Feint and Phant/Shad force fixes
Merge pull request #1135 from Fuzzysqurl/feint2

Feint fixes + improvements(?)