updated epics, improved couple nits