[CHANGE] some refactoring
[ADD] Support for filling lines that wrap, using weight, gravity and fill.