a lot of changes; events and discounts alpha version done