Fix/issues 317 to 320

[lecovi]

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes #317
Fixes #318
Fixes #319
Fixes #320

Has it been tested?

• Development testing done
• Unit or integration test implemented

Checklist

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have performed a peer-reviewed with team member(s)
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• Any dependent changes have been merged and published in downstream modules