Template improved, old lost code removed, some fixes