Fixed comments by Oskar.