Simple Completion engine
+ some line size bugfixe