fixed issue 6, fixed wrong amont/date displayed