#master - small improvements