small updates

move technical code at the end fo the form...
easier to explain to students...