little changes to make 'completion' more intuitive.