Bug fixes. Skip end-of-command lines. More specs