minor checks and typos