chore: project-wide comment cleanup + 4 small-bug fixes (#393)

chore: project-wide comment cleanup + 4 small-bug fixes (#393) #677