Changed line endings; added tags to names; removed forced comments