Fix typos and add implementation details