Template fixed, some more stuff added