more skeleton fixes

From now on, please pay more attention to detail. It would have been
faster for me to do some of this than going back and fixing
inconsistencies.