Typos
Major rehaul