updated header and source templates