Bugfixes from rc-fuzzi
New Template
Fixed EOF Errors