Added some fixes and fixed a picture

FAFAF