typos, fix compile issues