cleaned up code and formatting and connected a few forms