Optimized and fixed a few bugs.
New bug however is faling multiline test.