tiny improvements/fixes