* tidying up and fixing small bugs with easymotion