some more jpeg  and comment related changes