added modifiers for the creche, uni etc.
fixed variable names