Added some changes that were made to the official google demo this is based on, plus a fix for getting the device name