more improvements on mouse bucket, should test and look if improvements are really improvements