More skeletons, fixed unreliable stop button