mah bug fixes