bugfix and form impovements #1