added additional options, today/clear buttons, and a few minor fixes