fix warnings, and add in garthex changes