P: google addition, small fixes