Issue #182 Fixed long lines & error messeges