some minor improovements