emerge self_cmd bug fixes into shkeleton