Fixed a lot final version 1.0