Getting up to date files.

Pulling in updates from Grue Fork.