added newcomments and slightly changed main