code improvements

128, 92, 4, 3 fix