Various changes, added image parsing