Made a few corrections according to Sami's suggestions