Improved admin and fixed issue with discount calculating.