Made changes on reg. form, part of issue #30