More skeleton updates to make things look nice