Closes #31
Closes #24
Closes #30

Furthermore corrected a typing mistake