issues/138 fixes after code review