Integrated Bones 1.4

and cleaned some things up.