Bird class, minor changes elsewhere