Update

Incorporate minor updates from Skinny Bones