fix: chores and reliability fixes (#123-#125, #128, #132, #137-#139)

fix: chores and reliability fixes (#123-#125, #128, #132, #137-#139) #239