- Moved to array'ed buffer for performance improovement
- Enabled good html formatting if needed
- Some cleanups