Few tidying bits. Reviewed smart groups but think this is dealt with by BAO calls.