now mostly cinder. Cleaned up a number of issues in iscsi.sh.