Fixed: Wrong licence header
Fixed: Missing EOL
CS fixes...