Improved grammar and did some tests