Improved line handling
Improved documentation
documenatation tweaks