bug fixes by Yarkb, code recovring