various nice fixes