Fixed some of things that I reviewing. Did not test however.