another few niceities and fixes