misc improovements