Important improvements.

Better handling of empty lines o.O