typos
fix major build issues