fix skeleton
various changes