Bug fixes and updates to forms, variables and buttons;