some small changes/fixes