big fix of everyone's contributions #40

Closed jsalim-neu closed 7 months ago