minor changes, closer to happy with this.