all forms updated, and discount module complete