updoing some work and tidying up