Text / commenting improvements.
Fixed renaming issues in template and I/O.