Some skeleton updates and improvements