Add logging, update image parser