Line rewrapping, misc cleanup
Updated version for 0.1.0-b