minor imrpovements