some beauty fixes