cleanup
user templates fixes