Improve goToImage and currentImage handling, Improve regex for galFly