Added Portraits to many things and other minor fixes.