update and fix

thank you very much for your hard work