fix crirical bugs and add original goose behavior