Small bugfixes
Major bugfix : splits up to multiple lines