final adjustments to forms and fixed npe when no node mapping was used