More fixes and added new templates