Updated Items from the Ubuntu

This is a dump from the Ubuntu drive.