iso mode and other fixes