bug fixes, better phrasing, calendar option
under /src/data/ passed all my testing! commiting only this class with no changes within the rest of the project!