add plus one features and small fix