Updated license headers, general clean-up