Targetbone changes

These are the targetbone changes from Icedreamer.

These contain lots of whitespace issues.