fixed epic, some tidying left to do