small improvements :beer: