Fixed bugs, 1.0 Version complete