fix to new skeleton system and added some forgotten files