General update including vendors, fixes #1