block device handling improved