more updates, moved templates