further improvements to skeleton