small improvements
todo item remains for now