Just made a trunk merge in my local working copy, no big conflicts encountered. All 3 bugs seem to be solved :) The image and file output implementations in Tile need to be updated still, will let you know when i have a patch ready.