Vaguely fixed some things on this but the hyperbone models it depends on are still in need of fixes