Mistakes were fixed

Some stuff were wrong.. Now fixed.. :)