Fixing license headers, polishing