fixing these two issues: [#688](https://github.com/InfiniTimeOrg/InfiniTime/pull/688), [#625](https://github.com/InfiniTimeOrg/InfiniTime/pull/625)
and [#492](https://github.com/InfiniTimeOrg/InfiniTime/pull/492).
fixing these two issues: [#688](https://github.com/InfiniTimeOrg/InfiniTime/pull/688), [#625](https://github.com/InfiniTimeOrg/InfiniTime/pull/625)
and [#492](https://github.com/InfiniTimeOrg/InfiniTime/pull/492).