bug fixed
regenerated
diagram fixed
updated to include properties mandated by the relevant templates