Minor tweaks, error boxes now working