Minor additions to functionality and bugfix

* Unpack values for ISOs
* Fix bug in wait causing wait to not be executed