* #74: fixed some skeleton issues