Fix probably typos and formatting problems