Inital Comment
Fix bugs and typos