some tiny improvements