Comments improvements, image test fixed... #15