Accept only pictures

And some other little changes