fixed some typos :)
fixed more bugs and typos