Templates fixed.
Added templates & fixed some missing files.