Add options and enlarge forms (#45, #33, #39)