cleaning up some skeleton flaws