fix minor behaviors