Update overall picture

These patches take in features recently added.