couple of changes

not much progress today, just extracted the form for new department and
there is a lot left to do.