some style and behaviour corrections