add my fixes and changes