test of DO comments + some minor fixes