Fixed feature-warning and added missing new-lines.