many fixes from Google docs