bug fixes in mahapps