Updates and tidying up