More small fixes and added more unused templates for now