Fixed latest comments and sh*t.... ;)