some tweaks to the skeleton