Fixed minor bugs, extra new line. No + in the comment line, etc