entry and small changes