Add missing stuff from last pull + more