Merged all changes.

Merged various forks to include as many as possible improvements made to goose in the main trunk.