fixed bugs
finish bugs more last version