bunch fixes