bug fixes with mouse