Implemented command-line options for both modes (with and without calendars).
Better code (isolated conditions validating user inputs).