update proprietary files to what i think will work best, mostly from the infuse

Change-Id: Ice84c8dd130a93a6229a5e4797e3071a9b3a60f1