small changes/fixes