fix console mouse settings

and a little bit of tidying