Corrections - 28.04.2014

After correcting some stuff that Martin suggested.